From 8861115a925370ee5c5a235bb2953637066093a4 Mon Sep 17 00:00:00 2001 From: robertl Date: Tue, 3 Jan 2006 15:50:02 +0000 Subject: [PATCH] Rename uuid_generate to avoid conflich with one in darwin's libm. --- gpsbabel/coastexp.c | 2 +- gpsbabel/uuid.c | 2 +- gpsbabel/uuid.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gpsbabel/coastexp.c b/gpsbabel/coastexp.c index 4f2d35af5..d44b20f11 100755 --- a/gpsbabel/coastexp.c +++ b/gpsbabel/coastexp.c @@ -514,7 +514,7 @@ static char * ce_gen_uuid(void) { uuid_t uu; - uuid_generate(uu); + gb_uuid_generate(uu); sprintf(uuid_buffer, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6], uu[7], uu[8], uu[9], uu[10], uu[11], uu[12], uu[13], uu[14], uu[15]); diff --git a/gpsbabel/uuid.c b/gpsbabel/uuid.c index f7e568ca3..cba1d65ff 100755 --- a/gpsbabel/uuid.c +++ b/gpsbabel/uuid.c @@ -21,7 +21,7 @@ #include void -uuid_generate(uuid_t uu) +gb_uuid_generate(uuid_t uu) { unsigned char *cp; int i; diff --git a/gpsbabel/uuid.h b/gpsbabel/uuid.h index fb8dc02fc..161b89e91 100755 --- a/gpsbabel/uuid.h +++ b/gpsbabel/uuid.h @@ -19,4 +19,4 @@ typedef unsigned char uuid_t[16]; -void uuid_generate(uuid_t uu); +void gb_uuid_generate(uuid_t uu); -- 2.30.2